- Replace some locks with concurrent - Switch back to fast version of getPeersByCapability() - Java 5 cleanup