Various fixes around Simplex routine