Fix CATALINA_HOME export