Some more MC 1.7 work.