Fixes for y-offsets