Fixed compilation errors introduced by #69