api tweaks to rivets