Few consistency fixes
minor.
fixes
minor.