Changes to get it compiling on linux (Ubuntu 14.04) again.