Fixed all the Tomcat JNDI issues