Fixes after MIZAR integration