fix compilation errors. Issue #35