Fix a couple of pages, update