Fix internal fcalls