Prefixes and Notification fixes