Install script bug fixes