Additional tweaks as I've imported some settings from my home MBP