Bug Fixes as per trace files