Path etc. fixes.