Update gemfile and fixed what got broken after updating