Some fixups to include paths.