Just a few fixes cause I'm a perfectionist