Removed various compiler warnings