Fixed defines in witness dump