Solving some typos due to refactor