Minor cleanups and compiler warnings.