Some tweaks that have been sitting around for a while