Basic path checks + bugfix