Fixes for prod / jruby
For local dev