Minor cleanup / tweaks / bugfixes.