Some fixes (2/11)

Some fixes