More BACKTRACK tweaks (no effect on compiled releases)