Few final verification changes