Fix up some more of the rvm mac gunk