Installation fixes

I made similar (actually, almost identical changes) to orangutan already; this patch series just ports those over.