Fixes more good stuff.