More deprecation warnings fixed