Compiler warning fixes from Brian Knittel