Other Fixes

Evergreen 2.11.3 also contains the following bugfixes: