Minor tweaks and updates