Fixing various stuff.