Revert to previous options and fix java call