Fix some issues in WAR creation