Missing files and minor fixes