Additional flash fixes