Adding Fixes Sent By Pravat