Jeremy Newman : fix some deprecated functions