Fix some little bugs. I don't understand how we don't see it before