Fix up to align with recent RVM changes and fix a few little bugs