Fix deprecation messages
Fix deprecation messages - regen
Fix deprecation messages
Auto SF