fixes for split-view changes