minor fixes asked by Jas