Various tweaks and changes