Fixup a few syntax and validator errors

Change-Id: Id866ac01c812d591d2f7e32631bcbe5670977dee