Fixes to canonical urls etc