Fixed some issues with new offsets