r375: fixed compiling errors by the last change