Adding more missing files and correcting calls