Bug fixes with Install