Fix bugs from unsuccesful merge
Fix bugs from unsuccesful merge

Fix some calls that were changes in previous commits that was missed in the
conflict resolution

AdaptivePELE/AdaptivePELE,AdaptivePELE/AdaptivePELE,AdaptivePELE/AdaptivePELE,AdaptivePELE/AdaptivePELE