diff --git a/src/libs/scrobbling/impl/Scrobbling.hpp b/src/libs/scrobbling/impl/Scrobbling.hpp
index e4ac4256..6babe3f7 100644
--- a/src/libs/scrobbling/impl/Scrobbling.hpp
+++ b/src/libs/scrobbling/impl/Scrobbling.hpp
@@ -31,7 +31,6 @@ namespace Scrobbling
 	class Scrobbling : public IScrobbling
 	{
 		public:
-
 			Scrobbling(Database::Db& db);
 
 		private:
diff --git a/src/libs/scrobbling/impl/internal/InternalScrobbler.hpp b/src/libs/scrobbling/impl/internal/InternalScrobbler.hpp
index 062c3f95..64cfb87b 100644
--- a/src/libs/scrobbling/impl/internal/InternalScrobbler.hpp
+++ b/src/libs/scrobbling/impl/internal/InternalScrobbler.hpp
@@ -29,7 +29,6 @@ namespace Scrobbling
 			InternalScrobbler(Database::Db&	db);
 
 		private:
-
 			void listenStarted(const Listen& listen) override;
 			void listenFinished(const Listen& listen, std::chrono::seconds duration) override;
 
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp b/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
index c1f86aeb..4169a6c3 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
+++ b/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp
@@ -316,7 +316,7 @@ namespace Scrobbling
 		LOG(DEBUG) << "POST done. status = " << msg.status() << ", msg = '" << msg.body() << "'";
 		if (ec)
 		{
-			LOG(ERROR) << "Client error: " << ec.message();
+			LOG(ERROR) << "Retry " << queuedListen.retryCount << ", client error: '" << ec.message() << "'";
 			// may be a network error, try again later
 			if (++queuedListen.retryCount > _maxRetryCount)
 				_sendQueue.pop_front();
@@ -363,7 +363,7 @@ namespace Scrobbling
 	{
 		assert(_state == State::Idle);
 
-		const std::chrono::seconds duration {requestedDuration.count() > 0 ? requestedDuration : std::chrono::seconds {1}};
+		const std::chrono::seconds duration {clamp(requestedDuration, _minRetryWaitDuration, _maxRetryWaitDuration)};
 		LOG(DEBUG) << "Throttling for " << duration.count() << " seconds";
 
 		_ioService.schedule(duration, [this]
diff --git a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp b/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp
index 98611bc3..37952516 100644
--- a/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp
+++ b/src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.hpp
@@ -74,6 +74,8 @@ namespace Scrobbling
 			const std::string			_apiEndpoint;
 			const std::size_t			_maxRetryCount {2};
 			const std::chrono::seconds	_defaultRetryWaitDuration {30};
+			const std::chrono::seconds	_minRetryWaitDuration {1};
+			const std::chrono::seconds	_maxRetryWaitDuration {300};
 
 			Database::Db&				_db;
 			Wt::WIOService				_ioService;
diff --git a/src/lms/ui/LmsApplicationManager.hpp b/src/lms/ui/LmsApplicationManager.hpp
index b67e339d..2e3459cd 100644
--- a/src/lms/ui/LmsApplicationManager.hpp
+++ b/src/lms/ui/LmsApplicationManager.hpp
@@ -37,7 +37,6 @@ namespace UserInterface
 			Wt::Signal<LmsApplication&> applicationUnregistered;
 
 		private:
-
 			friend class LmsApplication;
 
 			void registerApplication(LmsApplication& application);
diff --git a/src/lms/ui/MediaPlayer.hpp b/src/lms/ui/MediaPlayer.hpp
index 033b53be..a5be6bd5 100644
--- a/src/lms/ui/MediaPlayer.hpp
+++ b/src/lms/ui/MediaPlayer.hpp
@@ -114,15 +114,6 @@ class MediaPlayer : public Wt::WTemplate
 		Wt::JSignal<>			playbackEnded;
 
 	private:
-
-		enum class State
-		{
-			Playing,
-			Stopped,
-		};
-		std::chrono::steady_clock::time_point _lastStateTimePoint;
-		State _state {State::Stopped};
-
 		std::unique_ptr<AudioFileResource>		_audioFileResource;
 		std::unique_ptr<AudioTranscodeResource>	_audioTranscodeResource;
 
diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp
index 05d56242..c900db34 100644
--- a/src/lms/ui/SettingsView.cpp
+++ b/src/lms/ui/SettingsView.cpp
@@ -308,7 +308,6 @@ class SettingsModel : public Wt::WFormModel
 
 		void initializeModels()
 		{
-
 			_transcodeModeModel = std::make_shared<TranscodeModeModel>();
 			_transcodeModeModel->add(Wt::WString::tr("Lms.Settings.transcode-mode.always"), MediaPlayer::Settings::Transcode::Mode::Always);
 			_transcodeModeModel->add(Wt::WString::tr("Lms.Settings.transcode-mode.never"), MediaPlayer::Settings::Transcode::Mode::Never);
diff --git a/src/test/database/DatabaseTest.cpp b/src/test/database/DatabaseTest.cpp
index 56443d25..bd612339 100644
--- a/src/test/database/DatabaseTest.cpp
+++ b/src/test/database/DatabaseTest.cpp
@@ -2098,7 +2098,6 @@ testDatabaseEmpty(Session& session)
 
 int main()
 {
-
 	try
 	{
 		// log to stdout