More offset fixes