Few java file updates