Fixes for Flash