Corrected some functions matching definitions