Fixing the good stuff