*Fix some method calls which were broken because of upstream pull