Minor changes by Valera.