Bugfixes all around.
[#74536668]