Snow Leopard: Add more initialization code