Try and reduce the distance to default
Fix various oopses and reduce the distance to default some more