Removed further compiler warnings