#83579 and other minor fixes