Removing a few compiler warnings