Minor fixes and path checks