Fix dodgy offsets