Sing sing sing sing

Couple of small changes. Not a real commit. Only committing to compile
for Jono