Merge "Fix compiler errors when compiled with debug option."