Hopefully compiles on Ubuntu 12.04 now