fixed deprecated things