Minor API enhancements