couple of gathermanager fixes