Minor changes (tabmanager)
conflicts