AW: fixes for mncc-harald branch