Soe fixes 1
Some fixes 2