[Observe-commits] 40/80: little improvments