Use any java executable in the path.
Small fixes.