Small changes, ready for MG