Minor fixes to issues left while actove record migration