Fixing typos and missing files

Change-Id: I6dfbb2295d6056adbc8d6861c24b715013a7de37