Backporting yet more forgotten changes from the forum