Quick fixes to install scripts