Some fixes of stuff

What it says up there.