Fixed some Unity problems