Fixed issues with OS X Snow Leopard