Replaced the last calls to deprecated non-unit methods