Fixes for flashwords