offsets fixes