Another fix of the pesky problem, and more fast mode tweaking