Fixing various bugs with Witness