Fix some fallout from the introduction of files