Patch up pom.xml and handle Canary.inf a small bit better.