minor fixes to varius places