Fixed built on OSX
Added missed mod str
folder marks
Avoid strlen usage