Fixes for empty instruments