more fixes for relative paths