Added minor fixes