diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java
index e4ab047a..1c4a1b48 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java
@@ -38,6 +38,7 @@ public class TypeHierarchyResultHandler implements ResultHandler<Object> {
 
 	private Map<Class<?>, ResultHandler<?>> resultHandlers = new HashMap<>();
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void handleResult(Object result) {
 		if (result == null) { // void methods
diff --git a/spring-shell-test-samples/src/main/java/com/example/CalculatorState.java b/spring-shell-test-samples/src/main/java/com/example/CalculatorState.java
index fe1a49a1..77d780c4 100644
--- a/spring-shell-test-samples/src/main/java/com/example/CalculatorState.java
+++ b/spring-shell-test-samples/src/main/java/com/example/CalculatorState.java
@@ -1,11 +1,14 @@
 package com.example;
 
+import org.springframework.stereotype.Component;
+
 /**
  *
  * Program state for the illustrative Spring Shell Calculator application.
  *
  * @author Sualeh Fatehi
  */
+@Component
 public class CalculatorState {
 
 	private int memory;