Osx setup fixes