diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/databasecommand_resolve.cpp
index d050d2eda..a140417d0 100644
--- a/src/libtomahawk/database/databasecommand_resolve.cpp
+++ b/src/libtomahawk/database/databasecommand_resolve.cpp
@@ -76,9 +76,9 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
     typedef QPair<int, float> scorepair_t;
 
     // STEP 1
-    QList< QPair<int, float> > artists = lib->searchTable( "artist", m_query->artist(), 10 );
-    QList< QPair<int, float> > tracks = lib->searchTable( "track", m_query->track(), 10 );
-    QList< QPair<int, float> > albums = lib->searchTable( "album", m_query->album(), 10 );
+    QList< QPair<int, float> > artists = lib->searchTable( "artist", m_query->artist() );
+    QList< QPair<int, float> > tracks = lib->searchTable( "track", m_query->track() );
+    QList< QPair<int, float> > albums = lib->searchTable( "album", m_query->album() );
 
     if ( artists.length() == 0 || tracks.length() == 0 )
     {
diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 941515fda..7cc7c021a 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -378,7 +378,7 @@ Servent::readyRead()
     }
 
     // they connected to us and want something we are offering
-    if( conntype == "accept-offer" || "push-offer" )
+    if ( conntype == "accept-offer" || conntype == "push-offer" )
     {
         sock->_msg.clear();
         tDebug( LOGVERBOSE ) << Q_FUNC_INFO << key << nodeid << "socket peer address = " << sock->peerAddress() << "socket peer name = " << sock->peerName();
diff --git a/src/libtomahawk/resolvers/qtscriptresolver.h b/src/libtomahawk/resolvers/qtscriptresolver.h
index 00c453c94..4006f3221 100644
--- a/src/libtomahawk/resolvers/qtscriptresolver.h
+++ b/src/libtomahawk/resolvers/qtscriptresolver.h
@@ -53,6 +53,7 @@ public:
     Q_INVOKABLE void addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName );
 
     QSharedPointer<QIODevice> customIODeviceFactory( const Tomahawk::result_ptr& result );
+
 public slots:
     QByteArray readRaw( const QString& fileName );
     QString readBase64( const QString& fileName );
@@ -66,7 +67,6 @@ public slots:
 
     void addTrackResults( const QVariantMap& results );
 
-
 private:
     QString m_scriptPath, m_urlCallback;
     QVariantMap m_resolverConfig;
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index d10832c5f..f341ef379 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -226,7 +226,6 @@ TomahawkApp::init()
 #ifndef ENABLE_HEADLESS
     EchonestGenerator::setupCatalogs();
 
-
     if ( !m_headless )
     {
         tDebug() << "Init MainWindow.";