Misc. changes to get it running on Ubuntu, mostly typos