Adding missing fixes
Adding missing fixes
Adding missing fixes from TI's trunk
Cleaning comments
Merging missing changes from TI's branch