More bug fixing in AddInstrument.