A few minor tweaks!