Added some minor checks