Some fixes 1