Minor fixes supporting bugwarrior