Fix ETC code & added false positive protections.