Fixed java7-32
Fixed git