Last min checks