Fixes for standard inserts and updates