Various fixes to address issues found in Vegas

Fixes #12