Bidirectional bug fixes