145b815 fixes for relative paths