Small tweaks to try and squash the double-post bug