Minor review fixes
Minor review fixes

EricssonResearch/calvin-constrained,EricssonResearch/calvin-constrained,EricssonResearch/calvin-constrained,EricssonResearch/calvin-constrained,EricssonResearch/calvin-constrained