Stability fixes and some fixMap stuff.