Patches from the RPM install

See commit log.