Faster file function fixes.