Trap improvements.