Cleanup and minor configuration updates.