Minor fixes of last commit