various fix
new flakes