Fixes for elimination of solve! (fix #13)