Some fixes2