Some tweaks to pageinfo handling.