*) Call*() around some more functions, which I missed in the last commit