Fix all flexi (37/38)

Fix all flexi