Fix some calls that shouldn't have gone to delegate