Added fixes inline with renamed methods