Ubuntu install fixes

I tried the ubuntu installer and didn't work for me, so this is the change to make it work. (The second commit is just cosmetics).