Fix some notification/enter issues