Small API enhancements.