Canonical pages and other minor improvements