SOme minor fixes