Fixes to datamanagers