Bug fixes for Ubuntu 10.04