MODE-1961 Corrected compiler warnings from previous MODE-1961 commit