Small enhancements to APIs