finish fixing build errors