Fixes to make cluster work with latest Portal code.