More Flash compat + minor stuff