Small Fixes for API function design