More fixes to xbmanager