fixes & relabel