Fixing build breaks and moving to Java7