Correct CP_speedup patch to compile
Make buildable the CP_multi instance patch
Bring up stf patch to speed for FreeBSD 1-