Fixes from integrating Navset2 Control.