Fix MORE build errors