File comparison, minor improvements