Nit fix to ch06 samples
Nit fix to ch07 samples
Updating middleware