Fix path join
Various fix