Various small changes and enhancements.