Snow Leopard: Misc changes