Removed unnecessary tomcat JAVA_HOME change.
Fixes to small errors.