Fix demo + middlewares