More small fixes
And some more