Fixup installer

Merge merge merge!