Fix build issues

Do the final iteration of n_file changes