Further fixes.
Merge pull request #2011 from brendandburns/fix

Further fixes due to validation changes.