Minor fixes for deprecated functions<br />More to come.