Added minor checks