Fixed compilation errors relating to issue 104