Upgraded messaging base, locks around configuration & shutdown