Some fixes 2