path fixes and other minor updates