More pre-pub tweaks...