fixes for mncc-harald branch