Just some small fixes (that I can't remember now)