Missing workspace manager fix, plugin manager merge fix, code clean-up.