Some path fixes for consistency, and revert an extra line