fixes for working on orchestra