Fix some path problems