Wrong path fixes

Fixes for #2236