Minor reply notification fixes and cleanup.