Some fixes 3