fix dependencies and shorten obligations solving