diff --git a/cmd/system-events.go b/cmd/system-events.go
index 5508f6a..4ea8a96 100644
--- a/cmd/system-events.go
+++ b/cmd/system-events.go
@@ -29,7 +29,6 @@ func (c *SystemEventsCmd) Run(args []string) int {
 		}
 		fmt.Printf("%s", line)
 	}
-	return 0
 }
 
 func (c *SystemEventsCmd) Help() string {
diff --git a/main.go b/main.go
index 5f2c69c..c9c4480 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,9 @@ func main() {
 
 	c.Commands = map[string]cli.CommandFactory{
 		"daemon": func() (cli.Command, error) {
-			return &cmd.DaemonCmd{eventChannel}, nil
+			return &cmd.DaemonCmd{
+				EventChannel: eventChannel,
+			}, nil
 		},
 		"autoscaler ls": func() (cli.Command, error) {
 			return &cmd.AutoscalerListCmd{}, nil