solve-system fixes