Fix compile failure from recent git master 434c3cf