Fix functions calls