Fix some problems with imports
Update Gemfile.lock