Small fixes

Some fixes.
Did't test it.
Can you?