RESTWS-310: Fixed compilation errors