Fix some more variable reference deprecation warnings