Fixed validation on a few pages
Merge commit 'b031875'