Cleaning up a few warnings.