[#1658] Fixed compilation issues