Cleaning up some warnings.