Small fixes to offset