Some fixes (3/11)

Some fixes