Fixed upgrade issues; Rebuilt Gemfile.lock file