Improved pre-checks