Fix minor bugs
am: 1dd331211b

* commit '1dd331211beded89ec02c37d68afced18d329375':
  Fix minor bugs