Made changes to work with interface changes in java-net-additions