toolset project structure changes - just clean up errors seen by fresh checkouts.