Resolve another build issue on stable/10 with a missing header
Fix a typo in the trap handler