Removing duplicate spec
Fix i18n deprication warning
Fix deprication warning, and issue with ambiguous fields