1. Added a missing '&' in Trickle library.
2. Fix a typo in uipopt.h