Small changes related to the previous commit that I forgot :(