fix some issues related to war deployment