Minor changes and add missing file.