Code verification fixes