Apply verification-enabling changes made while developing phase 2