Fix Sun Microsystems For The Win