Notifications and list wrap fixes