Merge "Fix some older (depricated) API so they work."