Minor fixes for flash