Changes necessary to build on Ubuntu 13.04