More gemfile fixes and schema changes