Small fixes of the previous commit