Reduced compiler warnings