Minor tweaks based on full run through on 13.04.