Corrections to the underlying manager interface and implementation