Small bits, trying to replace deprecated code