Minor tweaks to files and directories