mac-setup fixes