Improved the initial checks