just a round of cleanups, getting rid of compiler warnings.