Fixes for Heroku
Java 7