fix some path handling and execution retries