Fix a few files in the top-level directory