Solving fixes