Import small fixes from the blackhole swallowing branch that are unrelated to the swallowing itself.