Fix various things

Maybe