Tiny changes to validate the page