Changes for consistent use of offset/qlen