Issue #1611 compilation errors were fixed.