Fixing typos and missing files

Change-Id: I52a43c224df757d1fc50d9f2a84eaabb0d53fa62