Fix solutions a bit