TAMAYA-3:  Fixed compile issues.