Fixes to work with simulated_multimaster