Server Activity fixes