MODE-2189 Corrected compiler warnings