Fix unity issues