fixing build failures