Removed a few compiler warnings