Bugg fixes for relabelling