Fixes for Ubuntu 10.04