Bugfixes in offset