QA1 and smallblock headers issues