Improve the default checks