Some MORE fixes