Fix last batch of changes for 10.32.