Tweaks to new API additions