Fixed up things to work with the official Ubuntu package now that we've got the local vs. package install environment worked out.