Migration fixes for starting from a fresh DB