Work towards replacing depreciated logging calls