offset fixes