SOme minor tweaks....