Fix compiler warnings

9e2523271b0a8b6bfb3fb904f10a021253311fd4 didn't quite fix all the warnings, here are the last few.

Cheers,

See #3 and #2 for more info/discussion