Fix java side stuff