Offset changes and debug