last set of tweaks before fastspi2 rc1