Fixed compilation of UTs