Bug fixes for new installs