[Merge] Few more fixes after 3e7e620b merge.