Added tomcat to BuildConfig (not exported)
Some bugfixes