Fix up the create/update methods