Minor updates for latest .war file