diff --git a/common/src/cmd.rs b/common/src/cmd.rs
index caab209624..614d86bb72 100644
--- a/common/src/cmd.rs
+++ b/common/src/cmd.rs
@@ -330,7 +330,9 @@ impl ChatCommand {
                     vec!["pvp".to_owned(), "pve".to_owned()],
                     Optional,
                 )],
-                "Set your battle mode to pvp (player vs player) or pve (player vs environment).\n\
+                "Set your battle mode to:\n\
+                * pvp (player vs player)\n\
+                * pve (player vs environment).\n\
                 If called without arguments will show current battle mode.",
                 None,
             ),
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 160b06dfc0..e17ef01967 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -3152,7 +3152,7 @@ fn handle_battlemode(
             let elapsed = time - last_change;
             if elapsed < COOLDOWN {
                 let msg = format!(
-                    "Cooldown period active. Try again in {} second",
+                    "Cooldown period active. Try again in {:.0} seconds",
                     COOLDOWN - elapsed,
                 );
                 return Err(msg);