Fixes to MB actors