Fixing issues with idmanager