solver fixes