Minor tweaks to 2013.6