Fix for conformance/buffimgs test cases.