fix compilation errors with 2.061
2.061 is NOT yet supported due to regressions in compiler