1 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index 4ec7ddd04c4..983ba5165e3 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -511,7 +511,7 @@ public class NodeRepository extends AbstractComponent {
     public void setRemovable(ApplicationId application, List<Node> nodes) {
         try (Mutex lock = lock(application)) {
             List<Node> removableNodes =
-                nodes.stream().map(node -> node.with(node.allocation().get().removable(true)))
+                nodes.stream().map(node -> node.with(node.allocation().get().removable()))
                               .collect(Collectors.toList());
             write(removableNodes, lock);
         }
@@ -641,7 +641,7 @@ public class NodeRepository extends AbstractComponent {
     }
 
     private Node move(Node node, State toState, Agent agent, Optional<String> reason) {
-        if (toState == Node.State.active && node.allocation().isEmpty())
+        if (toState == Node.State.active && ! node.allocation().isPresent())
             illegal("Could not set " + node + " active. It has no allocation.");
 
         try (Mutex lock = lock(node)) {