More slight updates.
Land #2772, more slight updates from @todb-r7