Fix some typos and skip some function calls irrelevant in multi-folder mode