Some miscellaneous fixes with page changes