Some fixes
Merge branch 'fix-some-fixes'
fix gemfile