Fixes for root view manager