fix string
fix source for Java8
string fixes