Fixing Apple/Linux compatibility