Activity fixes