Fixed errors in some definitions