Merge branch 'master' into HEAD

2 files changed, 2 insertions, 2 deletions

diff --git a/cores/arduino/Stream.cpp b/cores/arduino/Stream.cpp
index a12a72e..39873aa 100644
--- a/cores/arduino/Stream.cpp
+++ b/cores/arduino/Stream.cpp
@@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout)  // sets the maximum number of mi
  // find returns true if the target string is found
 bool  Stream::find(char *target)
 {
-  return findUntil(target, NULL);
+  return findUntil(target, "");
 }
 
 // reads data from the stream until the target string of given length is found
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
index c637fda..3b613d4 100644
--- a/cores/arduino/USBAPI.h
+++ b/cores/arduino/USBAPI.h
@@ -36,7 +36,7 @@ struct ring_buffer;
 class Serial_ : public Stream
 {
 private:
-	int peek_buffer;
+	int peek_buffer = -1;
 public:
 	void begin(unsigned long);
 	void begin(unsigned long, uint8_t);