some more fixes for relative paths