Fix compile problems with outdated gems
Merge branch 'fix-bundle'