Some fixes 4