more fixes for verify in debug mode