diff --git a/src/library/ogg.cpp b/src/library/ogg.cpp
index 8a737825..91af9cf1 100644
--- a/src/library/ogg.cpp
+++ b/src/library/ogg.cpp
@@ -113,8 +113,11 @@ ogg_page::ogg_page(const char* buffer, size_t& advance) throw(std::runtime_error
 		throw std::runtime_error("Bad Ogg page flags");
 	//Compute length.
 	size_t b = 27 + (unsigned char)buffer[26];
-	for(unsigned i = 0; i < (unsigned char)buffer[26]; i++)
+	data_count = 0;
+	for(unsigned i = 0; i < (unsigned char)buffer[26]; i++) {
 		b += (unsigned char)buffer[27 + i];
+		data_count += (unsigned char)buffer[27 + i];
+	}
 	//Check the CRC.
 	uint32_t claimed = read32ule(buffer + 22);
 	uint32_t x = 0;
diff --git a/src/platform/wxwidgets/editor-movie.cpp b/src/platform/wxwidgets/editor-movie.cpp
index 96320269..c7f4acc3 100644
--- a/src/platform/wxwidgets/editor-movie.cpp
+++ b/src/platform/wxwidgets/editor-movie.cpp
@@ -558,7 +558,7 @@ void wxeditor_movie::_moviepanel::render_linen(text_framebuffer& fb, controller_
 			fb.write(i.title, 0, divcnt + 1 + i.position_left, y, 0x000000, 0xFFFFFF);
 		} else if(i.type == 0) {
 			//Button.
-			char c[2];
+			char32_t c[2];
 			bool v = (fcontrols.read_index(f, i.index) != 0);
 			c[0] = i.ch;
 			c[1] = 0;