Install script fixes