diff --git a/runtime.go b/runtime.go
index 7db3b4032..f2914dba2 100644
--- a/runtime.go
+++ b/runtime.go
@@ -187,7 +187,7 @@ func (runtime *Runtime) Destroy(container *Container) error {
 		return fmt.Errorf("Container %v not found - maybe it was already destroyed?", container.Id)
 	}
 
-	if err := container.Stop(10); err != nil {
+	if err := container.Stop(3); err != nil {
 		return err
 	}
 	if mounted, err := container.Mounted(); err != nil {
diff --git a/server.go b/server.go
index cd4771f41..3e95d5849 100644
--- a/server.go
+++ b/server.go
@@ -497,6 +497,7 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
 	if container == nil {
 		return fmt.Errorf("No such container: %s", name)
 	}
+
 	//logs
 	if logs {
 		if stdout {