fixing more build errors