Some fixes 13 2