Bunch of non-fix fixes.