Fix the closure conversion of recursive functions
Small modifications