Small changes. Build progresses further now.