Improve offset messages

Fixes #2684