Fixing string escape + many source generation fixes