Minor Flash cleanup