Start fixing build