Fix various stuff.