fixes that came up because of the runnable war example