Some fixes, and better IT testing