2008-10-06 insilmaril Various fixes, also from 1.12. branch