remote behaviours fixes