Flush flash bug fix and more