Fixing some weird Ruby 2.x problems