diff --git a/data/images/track-placeholder.png b/data/images/track-placeholder.png
index 333ea9101..24b3ac9b1 100644
Binary files a/data/images/track-placeholder.png and b/data/images/track-placeholder.png differ
diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp
index ed881c9eb..25cf7f02b 100644
--- a/src/TomahawkApp.cpp
+++ b/src/TomahawkApp.cpp
@@ -151,7 +151,7 @@ void
 TomahawkApp::installTranslator()
 {
 #if QT_VERSION >= 0x040800
-    QString locale = QLocale::system().uiLanguages().first();
+    QString locale = QLocale::system().uiLanguages().first().replace( "-", "_" );
 #else
     QString locale = QLocale::system().name();
 #endif
diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp
index 54db5da9b..ab710d605 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp
@@ -537,6 +537,8 @@ PlayableProxyModel::data( const QModelIndex& index, int role ) const
         return QVariant();
     if ( !m_headerStyle.contains( m_style ) )
         return QVariant();
+    if ( index.column() < 0 )
+        return QVariant();
 
     PlayableModel::Columns col = m_headerStyle[ m_style ].at( index.column() );
     QModelIndex sourceIdx = mapToSource( index );