Fixes more deprecation notices.