fixes for relative paths