Fix a couple issues preventing tests from passing in jruby