Fixed registry headers