lil fixes and migration