329368 more fixes to the build, versions are up to date and some deprecated code removed
19 files changed