More fixes to bundled war example