Adding activity, notifications, compatibility fixes