Fix custom attr, fix header