Java demo integration and fixes