diff --git a/runtime.go b/runtime.go
index 0834dd668a..d9f5b41590 100644
--- a/runtime.go
+++ b/runtime.go
@@ -326,7 +326,7 @@ func (runtime *Runtime) Create(config *Config, name string) (*Container, []strin
 	if config.PortSpecs != nil {
 		for _, p := range config.PortSpecs {
 			if strings.Contains(p, ":") {
-				warnings = append(warnings, "The mapping to a public ports on your host has been deprecated. Use -p to publish the ports.")
+				warnings = append(warnings, "The mapping to public ports on your host has been deprecated. Use -p to publish the ports.")
 				break
 			}
 		}
diff --git a/runtime_test.go b/runtime_test.go
index 07b641fd7e..cac04dfcc6 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -272,7 +272,7 @@ func TestRuntimeCreate(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if warnings == nil {
+	if warnings == nil || len(warnings) != 1 {
 		t.Error("Expected a warning, got none")
 	}
 }
diff --git a/server.go b/server.go
index f87b1e8ac0..d9e5bc0295 100644
--- a/server.go
+++ b/server.go
@@ -90,7 +90,7 @@ func (srv *Server) ContainerKill(name string, sig int) error {
 		} else {
 			// Otherwise, just send the requested signal
 			if err := container.kill(sig); err != nil {
-				return fmt.Errorf("Cannot kil container %s: %s", name, err)
+				return fmt.Errorf("Cannot kill container %s: %s", name, err)
 			}
 			// FIXME: Add event for signals
 		}