Fixing pulling in of functions