Misc enhancements.