Fix some issue with the final tomcat demo package assembly