Update 21 - minor fixes