Satya - BugFixes

cff