Fixed some definition issues