Tested all for r63 and fix some deprecated methods