Some fixes (7/11)

Some fixes