CAS-1457: Fixed compile issues