Changes to support 1.2 code (mostly just path names).