Fix some offsets