fixed some deprecated