other bug fixes in full scan