Compatibility fix/notification improvement for v13