master - minor fixes