Fixed some definition errors