bugfixes in solver