tweaks to rivets adapter