diff --git a/ChangeLog b/ChangeLog
index 355ab5c71..a38b7f759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-05-17  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* src/tgbaalgos/neverclaim.cc: Fix them.
+	* sanity/style.test: Diagnose semicolons with leading spaces.
+
 	* src/ltlvisit/forminf.cc: Fix style to please sanity checks.
 	Also avoid node_type_form_visitor where a dynamic_cast is done.
 
diff --git a/src/sanity/style.test b/src/sanity/style.test
index e36995b05..5e28210a9 100755
--- a/src/sanity/style.test
+++ b/src/sanity/style.test
@@ -90,6 +90,9 @@ while read file; do
    grep '[	 ]case.*:[^:].*;' $tmp &&
      diag 'Label should be on their own line.'
 
+   grep '[	 ];' $tmp &&
+     diag 'No space before semicolon.'
+
    $fail && echo "$file" >>failures
 done
 
diff --git a/src/tgbaalgos/neverclaim.cc b/src/tgbaalgos/neverclaim.cc
index 22145702d..54a2cf3c5 100644
--- a/src/tgbaalgos/neverclaim.cc
+++ b/src/tgbaalgos/neverclaim.cc
@@ -126,7 +126,7 @@ namespace spot
           if (fi_needed_ != 0)
             os_ << "  fi;" << std::endl;
           os_ << get_state_label(s, n) << ": ";
-          os_ << "/* " << automata_->format_state(s) << " */" ;
+          os_ << "/* " << automata_->format_state(s) << " */";
           os_ << std::endl;
           os_ << "  if" << std::endl;
           os_ << "  :: (0) -> goto " << get_state_label(s, n) << std::endl;
@@ -160,7 +160,7 @@ namespace spot
     {
       if (in != accept_all_)
         {
-          os_ << "  :: (" ;
+          os_ << "  :: (";
           const ltl::formula* f = bdd_to_formula(si->current_condition(),
 						 automata_->get_dict());
           to_spin_string(f, os_);