Virgin HOT FIXES!

Based these off current dev branch. Merged in a couple commits from previous virgin-new branch.