Minor things, don't pay much attention to this commit