migration fix and a 'i dont fully understand why this doesnt work at 4am' crutch.