UPDATE - minor fixes