Fix some issues with pathes