More small tweaks.

My commit messages are awesome.