Update for 64 and headers