Fixes problems that prevent direct inheritance from the common address manager