Small fixes of previous commit