More minor tinkering.