Misc tweaks / additions