Fixed path handling
Improved finding of java executable