Notification changes and fix to bad ref count code.