WIP: Improvements under JRuby so Travis will hopefully run