Fix some more build errors