Fixed some lingering issues with wartime