Fix compile error and warning from last merge