Cleanup potential bad method calls

Change-Id: I3b932884844c2e56d8887dad9cb12b66afd67764