Tweaks to structure