Fixes for composite PK? - Drizzle Team