Fixes from MononcQc