Playing catchup to upstream

Adding a few new things along the way.