MOre minor fixes