Pirangut safety improvements