Various tweaks and cleanup