More of the same kind of improvements

... didn't expect you to merge so fast :)