Hand hygiene minor fixes/improvements