Fixing flash and other small things