Fixes for running on Ubuntu. I think.