Some tweaks from a while ago