Fixes for distcheck where the paths were messed up