Solved problems from last commit