Fixes after Validation

Merge these in