More API Tweaks