Fixes for silly problems and added migration