Adam Hellberg:
	- Even more aggressive checking
	- Make zone checking more aggressive to counter false-positives
	- Fix invalid path to LSM in ToC
