Fixed some definitions