obvious crash avoidance fixes