migrations corrected after merging with master