Manual code review fixes for install script