SIMEX fixes and a few other misc.