Some more fixes to improve Opsview interaction