More OS X/RVM fixes