WG: fixes for mncc-harald branch