Fixed compilation errors relating to fix for issue 104