consistency fixes
narrow header dirty implementation