Avoided a few compiler warnings.