Small unite fixes