diff --git a/src/platform/qt/library/LibraryTree.cpp b/src/platform/qt/library/LibraryTree.cpp
index 45b972d77..6dc763e4a 100644
--- a/src/platform/qt/library/LibraryTree.cpp
+++ b/src/platform/qt/library/LibraryTree.cpp
@@ -147,15 +147,12 @@ void LibraryTree::rebuildTree() {
 	LibraryEntryRef currentGame = selectedEntry();
 
 	int count = m_widget->topLevelItemCount();
-	for (int a = 0; a < count; a++) {
-		m_widget->takeTopLevelItem(0);
+	for (int a = count - 1; a >= 0; --a) {
+		m_widget->takeTopLevelItem(a);
 	}
 
 	for (QTreeWidgetItem* i : m_pathNodes.values()) {
-		count = i->childCount();
-		for (int a = 0; a < count; a++) {
-			i->takeChild(0);
-		}
+		i->takeChildren();
 	}
 
 	if (m_currentStyle == LibraryStyle::STYLE_TREE) {
diff --git a/src/util/circle-buffer.c b/src/util/circle-buffer.c
index c60326e3c..c77a71eba 100644
--- a/src/util/circle-buffer.c
+++ b/src/util/circle-buffer.c
@@ -127,7 +127,7 @@ int CircleBufferWrite16(struct CircleBuffer* buffer, int16_t value) {
 
 size_t CircleBufferWrite(struct CircleBuffer* buffer, const void* input, size_t length) {
 	int8_t* data = buffer->writePtr;
-	if (buffer->size + sizeof(int16_t) > buffer->capacity) {
+	if (buffer->size + length > buffer->capacity) {
 		return 0;
 	}
 	size_t remaining = buffer->capacity - ((int8_t*) data - (int8_t*) buffer->data);