File iterator improvements