diff --git a/java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java b/java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
index 201062d9b..6b5b7532b 100644
--- a/java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
+++ b/java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
@@ -100,7 +100,7 @@ public class PhoneNumberToCarrierMapper {
    * Gets the name of the carrier for the given phone number only when it is 'safe' to display to
    * users. A carrier name is considered safe if the number is valid and for a region that doesn't
    * support
-   * {@linkplain http://en.wikipedia.org/wiki/Mobile_number_portability mobile number portability}.
+   * <a href="http://en.wikipedia.org/wiki/Mobile_number_portability">mobile number portability</a>.
    *
    * @param number  the phone number for which we want to get a carrier name
    * @param languageCode  the language code in which the name should be written
diff --git a/java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java b/java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java
index ce0084e8e..3f4f3d3a0 100644
--- a/java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java
+++ b/java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java
@@ -37,7 +37,7 @@ public class PrefixTimeZonesMap implements Externalizable {
   private static final String RAW_STRING_TIMEZONES_SEPARATOR = "&";
 
   /**
-    * Creates a {@link PrefixTimeZoneMap} initialized with {@code sortedPrefixTimeZoneMap}.  Note
+    * Creates a {@link PrefixTimeZonesMap} initialized with {@code sortedPrefixTimeZoneMap}.  Note
     * that the underlying implementation of this method is expensive thus should not be called by
     * time-critical applications.
     *
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 391540e9b..d3d9cedc8 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -811,7 +811,7 @@ public class PhoneNumberUtil {
    * works in such a way that the resultant subscriber number should be diallable, at least on some
    * devices. An example of how this could be used:
    *
-   * <pre>
+   * <pre>{@code
    * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
    * PhoneNumber number = phoneUtil.parse("16502530000", "US");
    * String nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number);
@@ -826,7 +826,7 @@ public class PhoneNumberUtil {
    *   areaCode = "";
    *   subscriberNumber = nationalSignificantNumber;
    * }
-   * </pre>
+   * }</pre>
    *
    * N.B.: area code is a very ambiguous concept, so the I18N team generally recommends against
    * using it for most purposes, but recommends using the more general {@code national_number}
@@ -871,7 +871,7 @@ public class PhoneNumberUtil {
    * number is formatted in the international format, if there is a subscriber number part that
    * follows. An example of how this could be used:
    *
-   * <pre>
+   * <pre>{@code
    * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
    * PhoneNumber number = phoneUtil.parse("18002530000", "US");
    * String nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number);
@@ -887,7 +887,7 @@ public class PhoneNumberUtil {
    *   nationalDestinationCode = "";
    *   subscriberNumber = nationalSignificantNumber;
    * }
-   * </pre>
+   * }</pre>
    *
    * Refer to the unittests to see the difference between this function and
    * {@link #getLengthOfGeographicalAreaCode}.