Various fixes to paths for upgrade to 3.5.2