Some tiny tweaks and helpers.