diff --git a/ChangeLog b/ChangeLog
index 91e5cbeba..6a08d197d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-01-25	Paul Giblock <drfaygo/at/gmail/dot/com>
+
+	* src/tracks/bb_track.cpp:
+	Integrate broken BB-clone bug from pitanga
+
+2009-01-25	Paul Giblock <drfaygo/at/gmail/dot/com>
+
+	* src/gui/widgets/knob.cpp:
+	Fix infinite recursion on Mac OSX
+
+	* plugins/flp_import/unrtf/html.c:
+	* plugins/flp_import/unrtf/output.h:
+	* plugins/flp_import/unrtf/convert.c:
+	Avoid compile warnings
+
 2008-12-22	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* CMakeLists.txt:
diff --git a/plugins/flp_import/unrtf/convert.c b/plugins/flp_import/unrtf/convert.c
index 87892a3cf..03b8165e0 100644
--- a/plugins/flp_import/unrtf/convert.c
+++ b/plugins/flp_import/unrtf/convert.c
@@ -2399,7 +2399,7 @@ static int cmd_ansi (Word *w, int align, char has_param, int param) {
  *=======================================================================*/
 
 static int cmd_ansicpg (Word *w, int align, char has_param, int param) {
-	int i;
+	unsigned int i;
 	for (i = 0; i < sizeof(codepages) / sizeof(CodepageInfo); i ++) {
 		charset_codepage = &codepages[i];
 		if (charset_codepage->cp == param) {
diff --git a/plugins/flp_import/unrtf/html.c b/plugins/flp_import/unrtf/html.c
index 69661dba5..752c588fc 100644
--- a/plugins/flp_import/unrtf/html.c
+++ b/plugins/flp_import/unrtf/html.c
@@ -877,7 +877,7 @@ static const char* cp850 [] = {
 /* 0xff */  "&nbsp;",
 };
 #if 1 /* daved - 0.20.3 */
-static char * Greek[] =
+static const char * Greek[] =
 {
 /* 0x80 */  "&ccedil;",
 /* 0x81 */  "&uuml;",
diff --git a/plugins/flp_import/unrtf/output.h b/plugins/flp_import/unrtf/output.h
index 1ea6b4e1a..10ef2a3bf 100644
--- a/plugins/flp_import/unrtf/output.h
+++ b/plugins/flp_import/unrtf/output.h
@@ -285,7 +285,7 @@ typedef struct {
 #if 1 /* daved 0.20.3 GREEK font support */
 	short greek_first_char;
 	short greek_last_char;
-	char **greek_translation_table;
+	const char **greek_translation_table;
 #endif
 
 	char *(*unisymbol_print) (unsigned short);
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index eb1c51156..7aed4ae72 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -474,7 +474,7 @@ void knob::mousePressEvent( QMouseEvent * _me )
 
 void knob::mouseMoveEvent( QMouseEvent * _me )
 {
-	if( m_buttonPressed == TRUE )
+	if( m_buttonPressed == TRUE && _me->pos() != m_origMousePos )
 	{
 		setPosition( _me->pos() );
 		emit sliderMoved( model()->value() );
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index 52831f139..0761eb2d5 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -455,7 +455,7 @@ void bbTrack::loadTrackSpecificSettings( const QDomElement & _this )
 
 	if( _this.hasAttribute( "clonebbt" ) )
 	{
-		const int src = _this.attribute( "clonebb" ).toInt();
+		const int src = _this.attribute( "clonebbt" ).toInt();
 		const int dst = s_infoMap[this];
 		engine::getBBTrackContainer()->createTCOsForBB( dst );
 		trackContainer::trackList tl =