Fixes for master / slave