am 365083a8: 7in fixes for Calculator

* commit '365083a83f88d75e8637403e781be4bbc2c7ea67':
  7in fixes for Calculator