Activity & Indicator Fixes