fixed more build errors