minor tweaks to support Ubuntu 8.04/Hardy