Add java6
Fix supervisor