Solved even more problems.