copy all the fixes over