Add hard-fix to DeployJava Lib and fix template