Some tweaks and such