fix compiler errors introduced by #1116