Fixed offsets due to mapsetup s3 special cases.