Made some minor fixes