Fixes for master/slave lights not behaving