start fixing build errors