Fix structure, header and location block