Fixed compiler warnings from recent commits