Fix some problematic stuff.