Changes to make it work in Ubuntu 12.10