Fixed some stuff pointed out by SpaceEmotion [ci skip]