Fix installation of default instrument.
Clean up.