diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd
index f96f85cb..8bcd2e82 100644
--- a/man/waybar-battery.5.scd
+++ b/man/waybar-battery.5.scd
@@ -18,6 +18,10 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 	typeof: string ++
 	The adapter to monitor, as in /sys/class/power_supply/ instead of auto detect.
 
+*full-at* ++
+	typeof: integer ++
+	Define the max percentage of the battery, usefull for an old battery, e.g. 96
+
 *interval* ++
 	typeof: integer ++
 	default: 60 ++
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index dfd67531..e7e831c9 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -115,6 +115,16 @@ const std::tuple<uint8_t, float, std::string> waybar::modules::Battery::getInfos
       time_remaining = -(float)(total_energy_full - total_energy) / total_power;
     }
     uint16_t capacity = total / batteries_.size();
+    // Handle full-at
+    if (config_["full-at"].isUInt()) {
+      auto full_at = config_["full-at"].asUInt();
+      if (full_at < 100) {
+        capacity = static_cast<float>(capacity / full_at) * 100;
+        if (capacity > full_at) {
+          capacity = full_at;
+        }
+      }
+    }
     return {capacity, time_remaining, status};
   } catch (const std::exception& e) {
     spdlog::error("Battery: {}", e.what());
diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
index d79e6aef..25c2a20d 100644
--- a/src/modules/pulseaudio.cpp
+++ b/src/modules/pulseaudio.cpp
@@ -21,7 +21,7 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value
   if (context_ == nullptr) {
     throw std::runtime_error("pa_context_new() failed.");
   }
-  if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOAUTOSPAWN, nullptr) < 0) {
+  if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOFAIL, nullptr) < 0) {
     auto err =
         fmt::format("pa_context_connect() failed: {}", pa_strerror(pa_context_errno(context_)));
     throw std::runtime_error(err);