Fix again 1.8.7 file api issues.