Improve deprecating messages in old API