Fixed up activity/notifications