Fix EMPTY string definition
Fix some path functions