Fixing Ubuntu 10 compatibility