Fixed scan limit checks