Minor tweaks to support master/slave