Follow up to f077a8e. Fixed compile errors. (bugreport:9252)