Bugfixes and changes to page identification.