Minor tweaks and changes