Raghu Fixes