More monor fixes