Satya - Bugfixes

3501, 3502, 3503