Fixed sourcing issues for RVM and a few more