Tweaks to attributes