Minor: fmt
Resolve deprecations