Path bugfix + small improvements