diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp
index 0ed9a2a85..1de42ba02 100644
--- a/apps/calculation/calculation.cpp
+++ b/apps/calculation/calculation.cpp
@@ -167,7 +167,7 @@ KDCoordinate Calculation::height(Context * context, bool expanded, bool allExpre
     } else {
       if (allExpressionsInline) {
         KDCoordinate exactOutputBaseline = exactLayout.baseline();
-        result = maxCoordinate(inputBaseline, exactOutputBaseline) + maxCoordinate(inputHeight - inputBaseline, exactOutputHeight-exactOutputBaseline);
+        result = std::max(inputBaseline, exactOutputBaseline) + std::max(inputHeight - inputBaseline, exactOutputHeight-exactOutputBaseline);
       } else {
         result = inputHeight + exactOutputHeight + doubleMargin;
       }
diff --git a/apps/calculation/history_view_cell.cpp b/apps/calculation/history_view_cell.cpp
index 74de1ce3d..a4707e847 100644
--- a/apps/calculation/history_view_cell.cpp
+++ b/apps/calculation/history_view_cell.cpp
@@ -185,7 +185,7 @@ void HistoryViewCell::layoutSubviews(bool force) {
   force);
   KDSize outputSize = m_scrollableOutputView.minimalSizeForOptimalDisplay();
   int singleLine = outputSize.width() + inputSize.width() < bounds().width() - 6;
-  int outputHeight = (singleLine && Poincare::Preferences::sharedPreferences()->resultDisplay() == Poincare::Preferences::ResultDisplay::Compact) ? (maxCoordinate(0, inputSize.height() - outputSize.height()) / 2) + maxCoordinate(0, (inputSize.height() - outputSize.height()) / 2) : inputSize.height();
+  int outputHeight = (singleLine && Poincare::Preferences::sharedPreferences()->resultDisplay() == Poincare::Preferences::ResultDisplay::Compact) ? (std::max(0, inputSize.height() - outputSize.height()) / 2) + std::max(0, (inputSize.height() - outputSize.height()) / 2) : inputSize.height();
   m_scrollableOutputView.setFrame(KDRect(
     std::max(0, maxFrameWidth - outputSize.width()),
     outputHeight,
diff --git a/ion/src/shared/events_modifier.cpp b/ion/src/shared/events_modifier.cpp
index 04fc1936d..db7e24d43 100644
--- a/ion/src/shared/events_modifier.cpp
+++ b/ion/src/shared/events_modifier.cpp
@@ -40,10 +40,6 @@ void setLongRepetition(bool longRepetition) {
 bool isLongRepetition() {
  return sLongRepetition;
 }
-  
-bool isLockActive() {
-  return sShiftAlphaStatus == ShiftAlphaStatus::AlphaLock || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
-}
 
 void setShiftAlphaStatus(ShiftAlphaStatus s) {
   sShiftAlphaStatus = s;