Fixed compilation errors introduced in CTL-356