Fixed WAR deploy issues