Removed more compiler warnings