Compiler warnings

Small changes to clear up some compiler warnings.