Small changes to work on Ubuntu 14.04