Minor fixes to fix cpp core generation style

Change-Id: I5f9223a59822b26230d1354c720ed6ee664d24a0