Fix all flexi (36/38)

Fix all flexi