Device notice fix