Migration fixes from direct schema.rb altering