Fix demo + middlewares
Middlewares