Sipa headersfirst8 patches

Various changes/fixes.