questormanager fixes from Daxten