Minor improvements + path bugfix.