Some fixes 04 12