Fixed some offset issues