Mathing fixes and not found improvements.