Fix notification (references etc.)