Tiny tweaks. Up to date with upstream afe8d748