Reduce number of compiler warnings