Changes to compile on Ubuntu 14.04.