Fix the buffer return code... as well as we can