Tweaks to various API classes