- Fixing things I missed in the last manual merge.