Fixed mac bugs + datastore config