Fix compilation errors for #738