Small tweaks. Build progresses further now.