Add JAVA_HOME in a more appropriate place