Fix for GetBuffer and file iterator.