Fixes for validation to make tests pass again