TAMAYA-19: Fixed compile issues.