Fix Linux compiler warnings from Pull 840