Various fixes 11 02