UF-70: fixes asked by porcelli on the PR