Installation bugfixes