Fix compiler warnings, some of those not being harmless. Thanks Phil and David. Fixes...