Small tweaks to make these files actually work.