Fixes for Karan
merge fix