Fixing all the small things