misc path fixes