more migration and NoneType problems