Snow Leopard: Fix more local variables