Minor bugfixes before IVO