Small fixes and enhancements.