Fixes for compilation against Ubuntu 10.10.