Install fixes

Heh seems like some of my other small fixes made it in here.