fixing some more build errors