Fix typos & deprecations