fixed some deprecated syntax