Minor API Improvements.