ADNFile fixes