Misc changes for macs being shite