more insert fixes