Fix various things.