Small bug fixes due to typo, file name changes and missing values