Wrap up file API fixes