A few more tweakages!