more flexi fixes