flakes fixes