Fixed method calls and requires to line up with API changes