Better path handling.