Missing files and fixes