Even more build errors should be fixed