Tweaks to reflect this repo and JDK8 additions