Properly fix dodgy Wartown.