Path bugs fixed