notifications and delegate callback fixes