Proper fpath updates and java version fix