Do more deprecation fixes under W6