Fixed some java 8 errors