Minor fixes for deprecated functions
More to come.