Migration fix
Minor fixes