Vm 2013 10 14 fixes

This is the other half of the pull request already started on BB.