Bug fixes during install