Fixup interface + canonical URL modification
Various bug fixes