Some fixes (6/11)

Some fixes