Offset fixes

Change-Id: I266dabc4038c7c25a4b5d9cc02959540fd9a5be4